mir: delete commented debug output

diff --git a/gdk/mir/gdkmircursor.c b/gdk/mir/gdkmircursor.c
index 7ce158a3ad37267c8c697dec4847e985f2d5af6c..92fe452da861e8990f0b8658c842bc0fd8e1e5a9 100644 (file)
--- a/gdk/mir/gdkmircursor.c
+++ b/gdk/mir/gdkmircursor.c
@@ -147,7 +147,6 @@ gdk_mir_cursor_get_surface (GdkCursor *cursor,
                             gdouble   *x_hot,
                             gdouble   *y_hot)
 {
-  g_printerr ("gdk_mir_cursor_get_surface\n");
   return NULL;
 }
 

diff --git a/gdk/mir/gdkmirdevicemanager.c b/gdk/mir/gdkmirdevicemanager.c
index 8628e04a04d06f20eee856b6e06bf5b05feb2ab1..68f40719cb036405e651966df5e78c1ba8508f6c 100644 (file)
--- a/gdk/mir/gdkmirdevicemanager.c
+++ b/gdk/mir/gdkmirdevicemanager.c
@@ -60,7 +60,6 @@ static GList *
 gdk_mir_device_manager_list_devices (GdkDeviceManager *device_manager,
                                      GdkDeviceType     type)
 {
-  //g_printerr ("gdk_mir_device_manager_list_devices (%u)\n", type);
   GdkMirDeviceManager *dm = GDK_MIR_DEVICE_MANAGER (device_manager);
 
   if (type == GDK_DEVICE_TYPE_MASTER)
@@ -79,7 +78,6 @@ gdk_mir_device_manager_list_devices (GdkDeviceManager *device_manager,
 static GdkDevice *
 gdk_mir_device_manager_get_client_pointer (GdkDeviceManager *device_manager)
 {
-  //g_printerr ("gdk_mir_device_manager_get_client_pointer\n");
   return GDK_MIR_DEVICE_MANAGER (device_manager)->pointer;
 }
 

diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c
index 9660729c5737622ad6f2a50119ee31251efb055d..9dccb32bd60e7c908f269977de9eaedeb7ce2229 100644 (file)
--- a/gdk/mir/gdkmirdisplay.c
+++ b/gdk/mir/gdkmirdisplay.c
@@ -177,8 +177,6 @@ _gdk_mir_display_open (const gchar *display_name)
   GdkMirDisplay *display;
   GDBusConnection *session;
 
-  //g_printerr ("gdk_mir_display_open\n");
-
   connection = mir_connect_sync (NULL, "GDK-Mir");
   if (!connection)
      return NULL;
@@ -314,40 +312,34 @@ gdk_mir_display_finalize (GObject *object)
 static const gchar *
 gdk_mir_display_get_name (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_get_name\n");
   return "Mir";
 }
 
 static GdkScreen *
 gdk_mir_display_get_default_screen (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_get_default_screen\n");
   return GDK_MIR_DISPLAY (display)->screen;
 }
 
 static void
 gdk_mir_display_beep (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_beep\n");
   /* No system level beep... */
 }
 
 static void
 gdk_mir_display_sync (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_sync\n");
 }
 
 static void
 gdk_mir_display_flush (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_flush\n");
 }
 
 static gboolean
 gdk_mir_display_has_pending (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_has_pending\n");
   /* We don't need to poll for events - so nothing pending */
   return FALSE;
 }
@@ -355,27 +347,23 @@ gdk_mir_display_has_pending (GdkDisplay *display)
 static void
 gdk_mir_display_queue_events (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_queue_events\n");
   /* We don't need to poll for events - so don't do anything*/
 }
 
 static void
 gdk_mir_display_make_default (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_make_default\n");
 }
 
 static GdkWindow *
 gdk_mir_display_get_default_group (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_get_default_group\n");
   return NULL;
 }
 
 static gboolean
 gdk_mir_display_supports_shapes (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_supports_shapes\n");
   /* Mir doesn't support shaped windows */
   return FALSE;
 }
@@ -383,35 +371,30 @@ gdk_mir_display_supports_shapes (GdkDisplay *display)
 static gboolean
 gdk_mir_display_supports_input_shapes (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_supports_input_shapes\n");
   return FALSE;
 }
 
 static gboolean
 gdk_mir_display_supports_clipboard_persistence (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_supports_clipboard_persistence\n");
   return FALSE;
 }
 
 static gboolean
 gdk_mir_display_supports_cursor_alpha (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_supports_cursor_alpha\n");
   return FALSE;
 }
 
 static gboolean
 gdk_mir_display_supports_cursor_color (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_supports_cursor_color\n");
   return FALSE;
 }
 
 static gboolean
 gdk_mir_display_supports_selection_notification (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_supports_selection_notification\n");
   return FALSE;
 }
 
@@ -419,7 +402,6 @@ static gboolean
 gdk_mir_display_request_selection_notification (GdkDisplay *display,
                                                 GdkAtom     selection)
 {
-  //g_printerr ("gdk_mir_display_request_selection_notification\n");
   return FALSE;
 }
 
@@ -430,7 +412,6 @@ gdk_mir_display_store_clipboard (GdkDisplay    *display,
                                  const GdkAtom *targets,
                                  gint           n_targets)
 {
-  //g_printerr ("gdk_mir_display_store_clipboard\n");
 }
 
 static void
@@ -438,7 +419,6 @@ gdk_mir_display_get_default_cursor_size (GdkDisplay *display,
                                          guint      *width,
                                          guint      *height)
 {
-  //g_printerr ("gdk_mir_display_get_default_cursor_size\n");
   *width = *height = 32; // FIXME: Random value
 }
 
@@ -447,7 +427,6 @@ gdk_mir_display_get_maximal_cursor_size (GdkDisplay *display,
                                          guint      *width,
                                          guint      *height)
 {
-  //g_printerr ("gdk_mir_display_get_maximal_cursor_size\n");
   *width = *height = 32; // FIXME: Random value
 }
 
@@ -471,21 +450,18 @@ gdk_mir_display_get_cursor_for_surface (GdkDisplay      *display,
                                         gdouble          x,
                                         gdouble          y)
 {
-  //g_printerr ("gdk_mir_display_get_cursor_for_surface (%f, %f)\n", x, y);
   return NULL;
 }
 
 static GdkAppLaunchContext *
 gdk_mir_display_get_app_launch_context (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_get_app_launch_context\n");
   return NULL;
 }
 
 static gulong
 gdk_mir_display_get_next_serial (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_get_next_serial\n");
   return GDK_MIR_DISPLAY (display)->serial++;
 }
 
@@ -493,7 +469,6 @@ static void
 gdk_mir_display_notify_startup_complete (GdkDisplay  *display,
                                          const gchar *startup_id)
 {
-  //g_printerr ("gdk_mir_display_notify_startup_complete\n");
 }
 
 static void
@@ -504,12 +479,6 @@ gdk_mir_display_create_window_impl (GdkDisplay    *display,
                                     GdkEventMask   event_mask,
                                     GdkWindowAttr *attributes)
 {
-  //g_printerr ("gdk_mir_display_create_window_impl");
-  //g_printerr (" window=%p", window);
-  //g_printerr (" location=(%d, %d)", window->x, window->y);
-  //g_printerr (" size=(%d, %d)", window->width, window->height);
-  //g_printerr ("\n");
-
   if (attributes->wclass == GDK_INPUT_OUTPUT)
     {
       window->impl = _gdk_mir_window_impl_new (display, window);
@@ -528,21 +497,18 @@ gdk_mir_display_create_window_impl (GdkDisplay    *display,
 static GdkKeymap *
 gdk_mir_display_get_keymap (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_get_keymap\n");
   return GDK_MIR_DISPLAY (display)->keymap;
 }
 
 static void
 gdk_mir_display_push_error_trap (GdkDisplay *display)
 {
-  //g_printerr ("gdk_mir_display_push_error_trap\n");
 }
 
 static gint
 gdk_mir_display_pop_error_trap (GdkDisplay *display,
                                 gboolean    ignored)
 {
-  //g_printerr ("gdk_mir_display_pop_error_trap\n");
   return 0;
 }
 
@@ -550,7 +516,6 @@ static GdkWindow *
 gdk_mir_display_get_selection_owner (GdkDisplay *display,
                                      GdkAtom     selection)
 {
-  //g_printerr ("gdk_mir_display_get_selection_owner\n");
   return NULL;
 }
 
@@ -594,7 +559,6 @@ gdk_mir_display_send_selection_notify (GdkDisplay *display,
                                        GdkAtom     property,
                                        guint32     time)
 {
-  //g_printerr ("gdk_mir_display_send_selection_notify\n");
 }
 
 static gint
@@ -954,7 +918,6 @@ static gchar *
 gdk_mir_display_utf8_to_string_target (GdkDisplay  *display,
                                        const gchar *str)
 {
-  //g_printerr ("gdk_mir_display_utf8_to_string_target\n");
   return NULL;
 }
 

diff --git a/gdk/mir/gdkmirkeyboard.c b/gdk/mir/gdkmirkeyboard.c
index 86c0d9f4ea93148eb9e1020498813a704c679130..289473a89a5b829faa135a1952dd5c3949cddf81 100644 (file)
--- a/gdk/mir/gdkmirkeyboard.c
+++ b/gdk/mir/gdkmirkeyboard.c
@@ -63,7 +63,6 @@ gdk_mir_keyboard_get_history (GdkDevice      *device,
                               GdkTimeCoord ***events,
                               gint           *n_events)
 {
-  g_printerr ("gdk_mir_keyboard_get_history\n");
   return FALSE;
 }
 
@@ -73,7 +72,6 @@ gdk_mir_keyboard_get_state (GdkDevice      *device,
                             gdouble         *axes,
                             GdkModifierType *mask)
 {
-  g_printerr ("gdk_mir_keyboard_get_state\n");
 }
 
 static void
@@ -81,7 +79,6 @@ gdk_mir_keyboard_set_window_cursor (GdkDevice *device,
                                     GdkWindow *window,
                                     GdkCursor *cursor)
 {
-  //g_printerr ("gdk_mir_keyboard_set_window_cursor\n");
   /* Keyboards don't have cursors... */
 }
 
@@ -91,7 +88,6 @@ gdk_mir_keyboard_warp (GdkDevice *device,
                        gdouble    x,
                        gdouble    y)
 {
-  //g_printerr ("gdk_mir_keyboard_warp\n");
   /* Can't warp a keyboard... */
 }
 
@@ -106,7 +102,6 @@ gdk_mir_keyboard_query_state (GdkDevice        *device,
                               gdouble          *win_y,
                               GdkModifierType  *mask)
 {
-  g_printerr ("gdk_mir_keyboard_query_state\n");
 }
 
 static GdkGrabStatus
@@ -118,7 +113,6 @@ gdk_mir_keyboard_grab (GdkDevice    *device,
                        GdkCursor    *cursor,
                        guint32       time_)
 {
-  //g_printerr ("gdk_mir_keyboard_grab\n");
   /* Mir doesn't do grabs, so sure, you have the grab */
   return GDK_GRAB_SUCCESS;
 }
@@ -127,7 +121,6 @@ static void
 gdk_mir_keyboard_ungrab (GdkDevice *device,
                          guint32    time_)
 {
-  //g_printerr ("gdk_mir_keyboard_ungrab\n");
   /* Mir doesn't do grabs */
 }
 
@@ -138,7 +131,6 @@ gdk_mir_keyboard_window_at_position (GdkDevice       *device,
                                      GdkModifierType *mask,
                                      gboolean         get_toplevel)
 {
-  //g_printerr ("gdk_mir_keyboard_window_at_position (%f, %f)\n", *win_x, *win_y);
   /* Keyboard don't have locations... */
   return NULL; // FIXME: Or the window with the keyboard focus?
 }
@@ -148,7 +140,6 @@ gdk_mir_keyboard_select_window_events (GdkDevice    *device,
                                        GdkWindow    *window,
                                        GdkEventMask  event_mask)
 {
-  g_printerr ("gdk_mir_keyboard_select_window_events\n");
 }
 
 static void

diff --git a/gdk/mir/gdkmirkeymap.c b/gdk/mir/gdkmirkeymap.c
index 88901240e22127e33ac9fe63c36143a5fed36f56..40a2343836f32c81f2c327596f377c591b352812 100644 (file)
--- a/gdk/mir/gdkmirkeymap.c
+++ b/gdk/mir/gdkmirkeymap.c
@@ -64,7 +64,6 @@ _gdk_mir_keymap_new (void)
 static PangoDirection
 gdk_mir_keymap_get_direction (GdkKeymap *keymap)
 {
-  //g_printerr ("gdk_mir_keymap_get_direction\n");
   GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
   gint i;
 
@@ -80,28 +79,24 @@ gdk_mir_keymap_get_direction (GdkKeymap *keymap)
 static gboolean
 gdk_mir_keymap_have_bidi_layouts (GdkKeymap *keymap)
 {
-  //g_printerr ("gdk_mir_keymap_have_bidi_layouts\n");
   return FALSE;
 }
 
 static gboolean
 gdk_mir_keymap_get_caps_lock_state (GdkKeymap *keymap)
 {
-  //g_printerr ("gdk_mir_keymap_get_caps_lock_state\n");
   return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_CAPS);
 }
 
 static gboolean
 gdk_mir_keymap_get_num_lock_state (GdkKeymap *keymap)
 {
-  //g_printerr ("gdk_mir_keymap_get_num_lock_state\n");
   return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_NUM);
 }
 
 static gboolean
 gdk_mir_keymap_get_scroll_lock_state (GdkKeymap *keymap)
 {
-  //g_printerr ("gdk_mir_keymap_get_scroll_lock_state\n");
   return xkb_state_led_name_is_active (GDK_MIR_KEYMAP (keymap)->xkb_state, XKB_LED_NAME_SCROLL);
 }
 
@@ -111,7 +106,6 @@ gdk_mir_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
                                        GdkKeymapKey **keys,
                                        gint          *n_keys)
 {
-  //g_printerr ("gdk_mir_keymap_get_entries_for_keyval\n");
   GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
   GArray *key_array;
   guint keycode;
@@ -164,7 +158,6 @@ gdk_mir_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
                                         guint        **keyvals,
                                         gint          *n_entries)
 {
-  //g_printerr ("gdk_mir_keymap_get_entries_for_keycode\n");
   GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
   gint num_layouts, layout;
   gint num_entries;
@@ -214,7 +207,6 @@ static guint
 gdk_mir_keymap_lookup_key (GdkKeymap          *keymap,
                            const GdkKeymapKey *key)
 {
-  //g_printerr ("gdk_mir_keymap_lookup_key\n");
   GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
   const xkb_keysym_t *syms;
   int num_syms;
@@ -292,7 +284,6 @@ gdk_mir_keymap_translate_keyboard_state (GdkKeymap       *keymap,
                                          gint            *effective_level,
                                          GdkModifierType *consumed_modifiers)
 {
-  //g_printerr ("gdk_mir_keymap_translate_keyboard_state\n");
   GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
   struct xkb_state *xkb_state;
   guint32 modifiers;
@@ -330,7 +321,6 @@ static void
 gdk_mir_keymap_add_virtual_modifiers (GdkKeymap       *keymap,
                                       GdkModifierType *state)
 {
-  //g_printerr ("gdk_mir_keymap_add_virtual_modifiers\n");
   // FIXME: What is this?
 }
 
@@ -338,7 +328,6 @@ static gboolean
 gdk_mir_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
                                       GdkModifierType *state)
 {
-  //g_printerr ("gdk_mir_keymap_map_virtual_modifiers\n");
   // FIXME: What is this?
   return TRUE;
 }
@@ -346,7 +335,6 @@ gdk_mir_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
 static guint
 gdk_mir_keymap_get_modifier_state (GdkKeymap *keymap)
 {
-  //g_printerr ("gdk_mir_keymap_get_modifier_state\n");
   GdkMirKeymap *mir_keymap = GDK_MIR_KEYMAP (keymap);
   xkb_mod_mask_t mods;
 

diff --git a/gdk/mir/gdkmirpointer.c b/gdk/mir/gdkmirpointer.c
index 393736152ea896e5a1978d806bc422c55d6921a3..b5504245a83f9ec037b84d665db9075367a30f4e 100644 (file)
--- a/gdk/mir/gdkmirpointer.c
+++ b/gdk/mir/gdkmirpointer.c
@@ -93,7 +93,6 @@ gdk_mir_pointer_get_history (GdkDevice      *device,
                              GdkTimeCoord ***events,
                              gint           *n_events)
 {
-  g_printerr ("gdk_mir_pointer_get_history\n");
   return FALSE;
 }
 
@@ -103,7 +102,6 @@ gdk_mir_pointer_get_state (GdkDevice       *device,
                            gdouble         *axes,
                            GdkModifierType *mask)
 {
-  //g_printerr ("gdk_mir_pointer_get_state\n");
   GdkMirPointer *p = GDK_MIR_POINTER (device);
   gdouble x, y;
 
@@ -120,7 +118,6 @@ gdk_mir_pointer_set_window_cursor (GdkDevice *device,
                                    GdkWindow *window,
                                    GdkCursor *cursor)
 {
-  //g_printerr ("gdk_mir_pointer_set_window_cursor\n");
   /* Mir doesn't support cursors */
 }
 
@@ -130,7 +127,6 @@ gdk_mir_pointer_warp (GdkDevice *device,
                       gdouble    x,
                       gdouble    y)
 {
-  //g_printerr ("gdk_mir_pointer_warp\n");
   /* Mir doesn't support warping */
 }
 
@@ -145,7 +141,6 @@ gdk_mir_pointer_query_state (GdkDevice        *device,
                              gdouble          *win_y,
                              GdkModifierType  *mask)
 {
-  //g_printerr ("gdk_mir_pointer_query_state\n");
   GdkMirPointer *p = GDK_MIR_POINTER (device);
 
   if (root_window)
@@ -173,7 +168,6 @@ gdk_mir_pointer_grab (GdkDevice    *device,
                       GdkCursor    *cursor,
                       guint32       time_)
 {
-  //g_printerr ("gdk_mir_pointer_grab\n");
   /* Mir doesn't do grabs, so sure, you have the grab */
   return GDK_GRAB_SUCCESS;
 }
@@ -182,7 +176,6 @@ static void
 gdk_mir_pointer_ungrab (GdkDevice *device,
                         guint32    time_)
 {
-  //g_printerr ("gdk_mir_pointer_ungrab\n");
   /* Mir doesn't do grabs */
 
   GdkDeviceGrabInfo *grab = _gdk_display_get_last_device_grab (gdk_device_get_display (device), device);
@@ -198,7 +191,6 @@ gdk_mir_pointer_window_at_position (GdkDevice       *device,
                                     GdkModifierType *mask,
                                     gboolean         get_toplevel)
 {
-  //g_printerr ("gdk_mir_pointer_window_at_position\n");
   GdkMirPointer *p = GDK_MIR_POINTER (device);
 
   if (win_x)
@@ -216,7 +208,6 @@ gdk_mir_pointer_select_window_events (GdkDevice    *device,
                                       GdkWindow    *window,
                                       GdkEventMask  event_mask)
 {
-  g_printerr ("gdk_mir_pointer_select_window_events\n");
   // FIXME?
 }
 

diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c
index 59c0d57338f1493573aa0aaa6f8ec31df431b470..c3b933ce5fbe2635d25e9cde775039c3cdd3184b 100644 (file)
--- a/gdk/mir/gdkmirscreen.c
+++ b/gdk/mir/gdkmirscreen.c
@@ -156,7 +156,6 @@ gdk_mir_screen_finalize (GObject *object)
 static GdkDisplay *
 gdk_mir_screen_get_display (GdkScreen *screen)
 {
-  //g_printerr ("gdk_mir_screen_get_display\n");
   return GDK_DISPLAY (GDK_MIR_SCREEN (screen)->display);
 }
 
@@ -190,7 +189,6 @@ get_output (GdkScreen *screen,
 static GdkWindow *
 gdk_mir_screen_get_root_window (GdkScreen *screen)
 {
-  //g_printerr ("gdk_mir_screen_get_root_window\n");
   GdkMirScreen *s = GDK_MIR_SCREEN (screen);
   gint width, height;
 
@@ -217,7 +215,6 @@ gdk_mir_screen_get_root_window (GdkScreen *screen)
 static gint
 gdk_mir_screen_get_n_monitors (GdkScreen *screen)
 {
-  //g_printerr ("gdk_mir_screen_get_n_monitors\n");
   MirDisplayConfig *config;
   gint count = 0;
   gint i;
@@ -234,7 +231,6 @@ gdk_mir_screen_get_n_monitors (GdkScreen *screen)
 static gint
 gdk_mir_screen_get_primary_monitor (GdkScreen *screen)
 {
-  //g_printerr ("gdk_mir_screen_get_primary_monitor\n");
   return 0; //?
 }
 
@@ -242,7 +238,6 @@ static gint
 gdk_mir_screen_get_monitor_width_mm    (GdkScreen *screen,
                                      gint       monitor_num)
 {
-  //g_printerr ("gdk_mir_screen_get_monitor_width_mm (%d)\n", monitor_num);
   const MirOutput *output = get_output (screen, monitor_num);
 
   return output ? mir_output_get_physical_width_mm (output) : 0;
@@ -252,7 +247,6 @@ static gint
 gdk_mir_screen_get_monitor_height_mm (GdkScreen *screen,
                                       gint       monitor_num)
 {
-  //g_printerr ("gdk_mir_screen_get_monitor_height_mm (%d)\n", monitor_num);
   const MirOutput *output = get_output (screen, monitor_num);
 
   return output ? mir_output_get_physical_height_mm (output) : 0;
@@ -262,7 +256,6 @@ static gchar *
 gdk_mir_screen_get_monitor_plug_name (GdkScreen *screen,
                                       gint       monitor_num)
 {
-  //g_printerr ("gdk_mir_screen_get_monitor_plug_name (%d)\n", monitor_num);
   const MirOutput *output = get_output (screen, monitor_num);
 
   if (output)
@@ -312,7 +305,6 @@ gdk_mir_screen_get_monitor_geometry (GdkScreen    *screen,
                                      gint          monitor_num,
                                      GdkRectangle *dest)
 {
-  //g_printerr ("gdk_mir_screen_get_monitor_geometry (%d)\n", monitor_num);
   const MirOutput *output;
   const MirOutputMode *mode;
 
@@ -341,7 +333,6 @@ gdk_mir_screen_get_monitor_workarea (GdkScreen    *screen,
                                      gint          monitor_num,
                                      GdkRectangle *dest)
 {
-  //g_printerr ("gdk_mir_screen_get_monitor_workarea (%d)\n", monitor_num);
   // FIXME: Don't know what this is
   gdk_mir_screen_get_monitor_geometry (screen, monitor_num, dest);
 }
@@ -351,8 +342,6 @@ gdk_mir_screen_get_setting (GdkScreen   *screen,
                             const gchar *name,
                             GValue      *value)
 {
-  //g_printerr ("gdk_mir_screen_get_setting (\"%s\")\n", name);
-
   if (strcmp (name, "gtk-theme-name") == 0)
     {
       g_value_set_string (value, "Ambiance");
@@ -608,7 +597,6 @@ static gint
 gdk_mir_screen_get_monitor_scale_factor (GdkScreen *screen,
                                          gint       monitor_num)
 {
-  //g_printerr ("gdk_mir_screen_get_monitor_scale_factor (%d)\n", monitor_num);
   /* Don't support monitor scaling */
   return 1;
 }

diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 1b27fd020c21972b98aba688c2e964fe90542664..5ba232aa5217cd5631b0743f97694df9d84d8cbf 100644 (file)
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -645,7 +645,6 @@ send_buffer (GdkWindow *window)
 static cairo_surface_t *
 gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_ref_cairo_surface window=%p\n", window);
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
   MirGraphicsRegion region;
   cairo_format_t pixel_format = CAIRO_FORMAT_ARGB32;
@@ -725,7 +724,6 @@ gdk_mir_window_impl_create_similar_image_surface (GdkWindow      *window,
                                                   int             width,
                                                   int             height)
 {
-  //g_printerr ("gdk_mir_window_impl_create_similar_image_surface window=%p\n", window);
   return cairo_image_surface_create (format, width, height);
 }
 
@@ -750,8 +748,6 @@ gdk_mir_window_impl_show (GdkWindow *window,
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
   cairo_surface_t *s;
 
-  //g_printerr ("gdk_mir_window_impl_show window=%p\n", window);
-
   impl->visible = TRUE;
   set_window_state (impl, mir_window_state_restored);
 
@@ -770,7 +766,6 @@ gdk_mir_window_impl_show (GdkWindow *window,
 static void
 gdk_mir_window_impl_hide (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_hide window=%p\n", window);
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
 
   impl->cursor_inside = FALSE;
@@ -782,7 +777,6 @@ gdk_mir_window_impl_hide (GdkWindow *window)
 static void
 gdk_mir_window_impl_withdraw (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_withdraw window=%p\n", window);
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
 
   impl->cursor_inside = FALSE;
@@ -794,14 +788,12 @@ gdk_mir_window_impl_withdraw (GdkWindow *window)
 static void
 gdk_mir_window_impl_raise (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_raise window=%p\n", window);
   /* We don't support client window stacking */
 }
 
 static void
 gdk_mir_window_impl_lower (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_lower window=%p\n", window);
   /* We don't support client window stacking */
 }
 
@@ -810,7 +802,6 @@ gdk_mir_window_impl_restack_toplevel (GdkWindow *window,
                                       GdkWindow *sibling,
                                       gboolean   above)
 {
-  //g_printerr ("gdk_mir_window_impl_restack_toplevel window=%p sibling=%p\n", window, sibling);
   /* We don't support client window stacking */
 }
 
@@ -822,15 +813,6 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
                                  gint       width,
                                  gint       height)
 {
-  /*
-  g_printerr ("gdk_mir_window_impl_move_resize");
-  g_printerr (" window=%p", window);
-  if (with_move)
-    g_printerr (" location=%d,%d", x, y);
-  if (width > 0)
-    g_printerr (" size=%dx%dpx", width, height);
-  g_printerr ("\n");
-  */
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
 
   /* If resize requested then rebuild window */
@@ -1202,7 +1184,6 @@ _gdk_mir_window_set_final_rect (GdkWindow    *window,
 static GdkEventMask
 gdk_mir_window_impl_get_events (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_get_events window=%p\n", window);
   return window->event_mask;
 }
 
@@ -1210,7 +1191,6 @@ static void
 gdk_mir_window_impl_set_events (GdkWindow    *window,
                                 GdkEventMask  event_mask)
 {
-  //g_printerr ("gdk_mir_window_impl_set_events window=%p\n", window);
   /* We send all events and let GDK decide */
 }
 
@@ -1242,8 +1222,6 @@ gdk_mir_window_impl_get_geometry (GdkWindow *window,
                                   gint      *width,
                                   gint      *height)
 {
-  //g_printerr ("gdk_mir_window_impl_get_geometry window=%p\n", window);
-
   if (x)
     *x = 0; // FIXME
   if (y)
@@ -1261,8 +1239,6 @@ gdk_mir_window_impl_get_root_coords (GdkWindow *window,
                                      gint      *root_x,
                                      gint      *root_y)
 {
-  //g_printerr ("gdk_mir_window_impl_get_root_coords window=%p\n", window);
-
   if (root_x)
     *root_x = x; // FIXME
   if (root_y)
@@ -1276,7 +1252,6 @@ gdk_mir_window_impl_get_device_state (GdkWindow       *window,
                                       gdouble         *y,
                                       GdkModifierType *mask)
 {
-  //g_printerr ("gdk_mir_window_impl_get_device_state window=%p\n", window);
   GdkWindow *child;
 
   _gdk_device_query_state (device, window, NULL, &child, NULL, NULL, x, y, mask);
@@ -1287,7 +1262,6 @@ gdk_mir_window_impl_get_device_state (GdkWindow       *window,
 static gboolean
 gdk_mir_window_impl_begin_paint (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_begin_paint window=%p\n", window);
   /* Indicate we are ready to be drawn onto directly? */
   return FALSE;
 }
@@ -1307,7 +1281,6 @@ gdk_mir_window_impl_shape_combine_region (GdkWindow            *window,
                                           gint                  offset_x,
                                           gint                  offset_y)
 {
-  //g_printerr ("gdk_mir_window_impl_shape_combine_region window=%p\n", window);
 }
 
 static void
@@ -1316,7 +1289,6 @@ gdk_mir_window_impl_input_shape_combine_region (GdkWindow            *window,
                                                 gint                  offset_x,
                                                 gint                  offset_y)
 {
-  // g_printerr ("gdk_mir_window_impl_input_shape_combine_region window=%p\n", window);
 }
 
 static void
@@ -1324,7 +1296,6 @@ gdk_mir_window_impl_destroy (GdkWindow *window,
                              gboolean   recursing,
                              gboolean   foreign_destroy)
 {
-  //g_printerr ("gdk_mir_window_impl_destroy window=%p\n", window);
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
 
   impl->visible = FALSE;
@@ -1333,9 +1304,8 @@ gdk_mir_window_impl_destroy (GdkWindow *window,
 
 static void
 gdk_mir_window_impl_focus (GdkWindow *window,
-                      guint32    timestamp)
+                           guint32    timestamp)
 {
-  //g_printerr ("gdk_mir_window_impl_focus window=%p\n", window);
 }
 
 static void
@@ -1380,21 +1350,18 @@ static void
 gdk_mir_window_impl_set_skip_taskbar_hint (GdkWindow *window,
                                            gboolean   skips_taskbar)
 {
-  //g_printerr ("gdk_mir_window_impl_set_skip_taskbar_hint window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_set_skip_pager_hint (GdkWindow *window,
                                          gboolean   skips_pager)
 {
-  //g_printerr ("gdk_mir_window_impl_set_skip_pager_hint window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_set_urgency_hint (GdkWindow *window,
                                       gboolean   urgent)
 {
-  //g_printerr ("gdk_mir_window_impl_set_urgency_hint window=%p\n", window);
 }
 
 static void
@@ -1405,7 +1372,6 @@ gdk_mir_window_impl_set_geometry_hints (GdkWindow         *window,
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
   MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
   MirWindowSpec *spec;
-  //g_printerr ("gdk_mir_window_impl_set_geometry_hints window=%p impl=%p\n", window, impl);
 
   impl->geometry_hints = *geometry;
   impl->geometry_mask = geom_mask;
@@ -1426,7 +1392,6 @@ gdk_mir_window_impl_set_title (GdkWindow   *window,
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
   MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
   MirWindowSpec *spec;
-  //g_printerr ("gdk_mir_window_impl_set_title window=%p\n", window);
 
   g_free (impl->title);
   impl->title = g_strdup (title);
@@ -1444,21 +1409,18 @@ static void
 gdk_mir_window_impl_set_role (GdkWindow   *window,
                               const gchar *role)
 {
-  //g_printerr ("gdk_mir_window_impl_set_role window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_set_startup_id (GdkWindow   *window,
                                     const gchar *startup_id)
 {
-  //g_printerr ("gdk_mir_window_impl_set_startup_id window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_set_transient_for (GdkWindow *window,
                                        GdkWindow *parent)
 {
-  //g_printerr ("gdk_mir_window_impl_set_transient_for window=%p\n", window);
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
 
   if (impl->transient_for == parent)
@@ -1475,14 +1437,12 @@ static void
 gdk_mir_window_impl_get_frame_extents (GdkWindow    *window,
                                        GdkRectangle *rect)
 {
-  //g_printerr ("gdk_mir_window_impl_get_frame_extents window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_set_accept_focus (GdkWindow *window,
                                       gboolean   accept_focus)
 {
-  //g_printerr ("gdk_mir_window_impl_set_accept_focus window=%p\n", window);
   /* Mir clients cannot control focus */
 }
 
@@ -1490,7 +1450,6 @@ static void
 gdk_mir_window_impl_set_focus_on_map (GdkWindow *window,
                                       gboolean focus_on_map)
 {
-  //g_printerr ("gdk_mir_window_impl_set_focus_on_map window=%p\n", window);
   /* Mir clients cannot control focus */
 }
 
@@ -1498,7 +1457,6 @@ static void
 gdk_mir_window_impl_set_icon_list (GdkWindow *window,
                                    GList     *pixbufs)
 {
-  //g_printerr ("gdk_mir_window_impl_set_icon_list window=%p\n", window);
   // ??
 }
 
@@ -1506,68 +1464,58 @@ static void
 gdk_mir_window_impl_set_icon_name (GdkWindow   *window,
                                    const gchar *name)
 {
-  //g_printerr ("gdk_mir_window_impl_set_icon_name window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_iconify (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_iconify window=%p\n", window);
   /* We don't support iconification */
 }
 
 static void
 gdk_mir_window_impl_deiconify (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_deiconify window=%p\n", window);
   /* We don't support iconification */
 }
 
 static void
 gdk_mir_window_impl_stick (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_stick window=%p\n", window);
   /* We do not support stick/unstick in Mir */
 }
 
 static void
 gdk_mir_window_impl_unstick (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_unstick window=%p\n", window);
   /* We do not support stick/unstick in Mir */
 }
 
 static void
 gdk_mir_window_impl_maximize (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_maximize window=%p\n", window);
   set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_maximized);
 }
 
 static void
 gdk_mir_window_impl_unmaximize (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_unmaximize window=%p\n", window);
   set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_restored);
 }
 
 static void
 gdk_mir_window_impl_fullscreen (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_fullscreen window=%p\n", window);
   set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_fullscreen);
 }
 
 static void
 gdk_mir_window_impl_apply_fullscreen_mode (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_apply_fullscreen_mode window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_unfullscreen (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_unfullscreen window=%p\n", window);
   set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_restored);
 }
 
@@ -1575,7 +1523,6 @@ static void
 gdk_mir_window_impl_set_keep_above (GdkWindow *window,
                                     gboolean   setting)
 {
-  //g_printerr ("gdk_mir_window_impl_set_keep_above window=%p\n", window);
   /* We do not support keep above/below in Mir */
 }
 
@@ -1583,14 +1530,12 @@ static void
 gdk_mir_window_impl_set_keep_below (GdkWindow *window,
                                     gboolean setting)
 {
-  //g_printerr ("gdk_mir_window_impl_set_keep_below window=%p\n", window);
   /* We do not support keep above/below in Mir */
 }
 
 static GdkWindow *
 gdk_mir_window_impl_get_group (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_get_group window=%p\n", window);
   return NULL;
 }
 
@@ -1598,21 +1543,18 @@ static void
 gdk_mir_window_impl_set_group (GdkWindow *window,
                                GdkWindow *leader)
 {
-  //g_printerr ("gdk_mir_window_impl_set_group window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_set_decorations (GdkWindow       *window,
                                      GdkWMDecoration  decorations)
 {
-  //g_printerr ("gdk_mir_window_impl_set_decorations window=%p decorations=%d\n", window, decorations);
 }
 
 static gboolean
 gdk_mir_window_impl_get_decorations (GdkWindow       *window,
                                      GdkWMDecoration *decorations)
 {
-  //g_printerr ("gdk_mir_window_impl_get_decorations window=%p\n", window);
   return FALSE;
 }
 
@@ -1620,7 +1562,6 @@ static void
 gdk_mir_window_impl_set_functions (GdkWindow     *window,
                                    GdkWMFunction  functions)
 {
-  //g_printerr ("gdk_mir_window_impl_set_functions window=%p\n", window);
 }
 
 static void
@@ -1632,7 +1573,6 @@ gdk_mir_window_impl_begin_resize_drag (GdkWindow     *window,
                                        gint           root_y,
                                        guint32        timestamp)
 {
-  //g_printerr ("gdk_mir_window_impl_begin_resize_drag window=%p\n", window);
 }
 
 static void
@@ -1643,47 +1583,40 @@ gdk_mir_window_impl_begin_move_drag (GdkWindow *window,
                                      gint       root_y,
                                      guint32    timestamp)
 {
-  //g_printerr ("gdk_mir_window_impl_begin_move_drag window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_enable_synchronized_configure (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_enable_synchronized_configure window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_configure_finished (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_configure_finished window=%p\n", window);
 }
 
 static void
 gdk_mir_window_impl_set_opacity (GdkWindow *window,
                                  gdouble    opacity)
 {
-  //g_printerr ("gdk_mir_window_impl_set_opacity window=%p\n", window);
   // FIXME
 }
 
 static void
 gdk_mir_window_impl_destroy_notify (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_destroy_notify window=%p\n", window);
 }
 
 static GdkDragProtocol
 gdk_mir_window_impl_get_drag_protocol (GdkWindow *window,
                                        GdkWindow **target)
 {
-  //g_printerr ("gdk_mir_window_impl_get_drag_protocol window=%p\n", window);
   return 0;
 }
 
 static void
 gdk_mir_window_impl_register_dnd (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_register_dnd window=%p\n", window);
 }
 
 static GdkDragContext *
@@ -1693,7 +1626,6 @@ gdk_mir_window_impl_drag_begin (GdkWindow *window,
                                 gint       x_root,
                                 gint       y_root)
 {
-  //g_printerr ("gdk_mir_window_impl_drag_begin window=%p\n", window);
   return NULL;
 }
 
@@ -1701,7 +1633,6 @@ static void
 gdk_mir_window_impl_process_updates_recurse (GdkWindow      *window,
                                              cairo_region_t *region)
 {
-  //g_printerr ("gdk_mir_window_impl_process_updates_recurse window=%p\n", window);
   cairo_rectangle_int_t rectangle;
 
   /* We redraw the whole region, but we should track the buffers and only redraw what has changed since we sent this buffer */
@@ -2009,7 +1940,6 @@ gdk_mir_window_impl_delete_property (GdkWindow *window,
 static gint
 gdk_mir_window_impl_get_scale_factor (GdkWindow *window)
 {
-  //g_printerr ("gdk_mir_window_impl_get_scale_factor window=%p\n", window);
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
   return impl->output_scale;
 }
@@ -2018,7 +1948,6 @@ static void
 gdk_mir_window_impl_set_opaque_region (GdkWindow      *window,
                                        cairo_region_t *region)
 {
-  //g_printerr ("gdk_mir_window_impl_set_opaque_region window=%p\n", window);
   /* FIXME: An optimisation to tell the compositor which regions of the window are fully transparent */
 }
 
@@ -2029,7 +1958,6 @@ gdk_mir_window_impl_set_shadow_width (GdkWindow *window,
                                       gint       top,
                                       gint       bottom)
 {
-  // g_printerr ("gdk_mir_window_impl_set_shadow_width window=%p\n", window);
 }
 
 static gboolean
@@ -2204,7 +2132,6 @@ _gdk_mir_window_set_scale (GdkWindow *window,
   GdkRectangle area = {0, 0, window->width, window->height};
   cairo_region_t *region;
   gint new_scale = (gint) round (scale);
-  // g_printerr ("_gdk_mir_window_set_scale impl=%p\n", impl);
 
   if (impl->output_scale != new_scale)
     {